NetworkMenu: show the device name instead of Bluetooth

To distinguish the bluetooth network menu from the bluetooth
menu proper, use the device name as the label.
Also, replace Connect with "Use as Internet connection"

https://bugzilla.gnome.org/show_bug.cgi?id=709353

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 1d6d7c5646720a89a4eb39feb1457e00a50ddd2e..696e898cdde07b0562ee4da5f51343d645e09a4f 100644 (file)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -131,7 +131,7 @@ const NMConnectionItem = new Lang.Class({
 
     _sync: function() {
         let isActive = this.isActive();
-        this.labelItem.label.text = isActive ? _("Turn Off") : _("Connect");
+        this.labelItem.label.text = isActive ? _("Turn Off") : this._section.getConnectLabel();
         this.switchItem.setToggleState(isActive);
         this.switchItem.setStatus(this._getStatus());
         this.emit('icon-changed');
@@ -223,6 +223,10 @@ const NMConnectionSection = new Lang.Class({
         return _("Off");
     },
 
+    getConnectLabel: function() {
+        return _("Connect");
+    },
+
     _hasConnection: function(connection) {
         return this._connectionItems.has(connection.get_uuid());
     },
@@ -566,6 +570,14 @@ const NMDeviceBluetooth = new Lang.Class({
             return 'network-cellular-signal-none-symbolic';
     },
 
+    _getDescription: function() {
+        return this._device.name;
+    },
+
+    getConnectLabel: function() {
+        return _("Use as Internet connection");
+    },
+
     getIndicatorIcon: function() {
         let state = this._device.active_connection.state;
         if (state == NetworkManager.ActiveConnectionState.ACTIVATING)